Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: refactor ScaledJob to be used with scale_handler #4707

Merged
merged 21 commits into from
Jul 12, 2023
Merged

refactor: refactor ScaledJob to be used with scale_handler #4707

merged 21 commits into from
Jul 12, 2023

Conversation

yoongon
Copy link
Contributor

@yoongon yoongon commented Jun 18, 2023 •
edited by zroubalik
Loading

Provide a description of what has been changed
Currently, ScaledJob is left at scalers_cache.go. Move this one into the scale_handler.go for consistent with ScaledObject.

FYI.

keda/pkg/scaling/cache/scalers_cache.go

Line 144 in bce3375

// TODO needs refactor - move ScaledJob related methods to scale_handler, the similar way ScaledObject methods are

Checklist

Fixes #4781

@yoongon yoongon requested a review from a team as a code owner June 18, 2023 12:29
@github-actions
Copy link

Thank you for your contribution! 🙏 We will review your PR as soon as possible.

While you are waiting, make sure to:

Learn more about:

@yoongon yoongon force-pushed the feature/refactor-handler2 branch 6 times, most recently from dfeea1b to e1eba2c Compare June 18, 2023 13:58
zroubalik
zroubalik reviewed Jun 18, 2023
View reviewed changes
Copy link
Member

@zroubalik zroubalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for tackling this, my ambition behind this is not just move these functions but also revise & clenup the code. Also some additional tests would be nice.

pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
@yoongon yoongon requested a review from zroubalik June 19, 2023 22:57
@yoongon yoongon force-pushed the feature/refactor-handler2 branch 4 times, most recently from 2b36c23 to b057f22 Compare June 20, 2023 23:06
@yoongon
Copy link
Contributor Author

yoongon commented Jun 26, 2023

@zroubalik
Could you check my comment again? Thanks.

zroubalik
zroubalik reviewed Jul 7, 2023
View reviewed changes
Copy link
Member

@zroubalik zroubalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yoongon first of all, sorry for the delay, I have been busy with other stuff. Great job, could you please address the rest of the minor concerns? Thanks!

pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
pkg/scaling/utils/metrics.go Outdated Show resolved Hide resolved
pkg/scaling/utils/metrics.go Outdated Show resolved Hide resolved
pkg/scaling/utils/metrics.go Outdated Show resolved Hide resolved
@zroubalik
Copy link
Member

zroubalik commented Jul 7, 2023 •
edited by github-actions bot
Loading

/run-e2e
Update: You can check the progress here

zroubalik
zroubalik reviewed Jul 7, 2023
View reviewed changes
Copy link
Member

@zroubalik zroubalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yoongon could you please also create an issue for this effort and link it in the Changelog? (Other section)

@yoongon yoongon force-pushed the feature/refactor-handler2 branch 2 times, most recently from f7c5ce1 to 25ff08f Compare July 8, 2023 05:53
@yoongon yoongon mentioned this pull request Jul 8, 2023
Closed
@yoongon yoongon force-pushed the feature/refactor-handler2 branch 2 times, most recently from 428b5a6 to ef3f726 Compare July 8, 2023 07:05
@yoongon
Copy link
Contributor Author

yoongon commented Jul 8, 2023 •
edited
Loading

@zroubalik
Thanks for the detail check. I've updated code based on your review and update changelog as well.
Please check and let me know if there is anything I can contribute more :)

BTW, one test hasn't passed, but I don't think it's related with this change.

@yoongon yoongon requested a review from zroubalik July 8, 2023 12:25
zroubalik
zroubalik reviewed Jul 10, 2023
View reviewed changes
Copy link
Member

@zroubalik zroubalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, there are some leftovers, sorry for being so pedantic about this 😄

pkg/scaling/scaledjob/metrics.go Outdated Show resolved Hide resolved
pkg/scaling/scaledjob/metrics.go Outdated Show resolved Hide resolved
pkg/scaling/scaledjob/metrics.go Show resolved Hide resolved
pkg/scaling/scaledjob/metrics.go Outdated Show resolved Hide resolved
pkg/scaling/scaledjob/metrics.go Show resolved Hide resolved
pkg/scaling/scale_handler.go Outdated Show resolved Hide resolved
zroubalik
zroubalik reviewed Jul 10, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@yoongon yoongon force-pushed the feature/refactor-handler2 branch 3 times, most recently from 7720f5d to da6cd84 Compare July 12, 2023 13:42
@zroubalik
Copy link
Member

zroubalik commented Jul 12, 2023 •
edited by github-actions bot
Loading

/run-e2e
Update: You can check the progress here

@yoongon
Refator to use GetMetricsAndActivityForScaler
9a6becb 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Implement test cases inside scale_handler_test.go
37e75b6 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
All tests work
9fce158 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Make all test cases runnable under scale_hanlder_test
b9818da 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Delete unnecessary lines
2d3ed5d 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Delete scalers_cache_tests.go after migration
145a357 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Remove methods at scalers_cache.go as well
b908313 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Change receiver name
764b4d8 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Sort module to pass statick analysis
7480fcd 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Use separate package for the method getTargetAverageValue
62ec041 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Relocate createMetricSpec and related test cases
c44fcfb 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Rearrange import module to pass static analysis
ce7c464 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Add tests for scaledJob identifier
d486a66 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
rename the package name and delete comments
0b862a1 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Move scaledJob metric logic under scaledJob package
ff5cd11 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Add change log
080651c 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Add CalculateQueueLengthAndMaxValue at scaledJob
8197f20 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Use renamed function getTargetAverageValue
40922d3 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Move createMetricSpec inside test code
68e6779 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Use different metric name to pass static analysis
f9344e9 
Signed-off-by: Yoon Park <[email protected]>
@yoongon
Delete ineffectual assignment
4259185 
Signed-off-by: Yoon Park <[email protected]>
@zroubalik
Copy link
Member

zroubalik commented Jul 12, 2023 •
edited by github-actions bot
Loading

/run-e2e
Update: You can check the progress here

zroubalik
zroubalik approved these changes Jul 12, 2023
View reviewed changes
Copy link
Member

@zroubalik zroubalik left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks for the effort! Really appreciate this :)

@zroubalik zroubalik enabled auto-merge (squash) July 12, 2023 16:21
@zroubalik zroubalik merged commit 2a3d9f1 into kedacore:main Jul 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zroubalik zroubalik zroubalik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move ScaledJob logic under scale_handler.go
2 participants
@yoongon @zroubalik